Merge tag 'upstream/2.3.3'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 18 Jul 2015 14:33:48 +0000 (17:33 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 18 Jul 2015 14:33:48 +0000 (17:33 +0300)
commit6f108dec916188146302fecc7e7b028535a53fb4
treea6484960a47b0d6346e9d2d2fefe29d0ff9dc65a
parentb6b35dc4e09f1f2df91ff5452fb85037480115b8
parentb5a917861ca65c6b83b35380084e8647bc224eaf
Merge tag 'upstream/2.3.3'

Upstream version 2.3.3
CMakeLists.txt